Add basic hungarian GUI translations. Switch on xcsv format.

diff --git a/win32/gui-2/GPSBabelGUI.dof b/win32/gui-2/GPSBabelGUI.dof
index b9cfeeae4aa083f6571db8ea385206c0de4aadeb..eeb5eda806e1ec7bc4c817977b8f817501cc3617 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dof
+++ b/win32/gui-2/GPSBabelGUI.dof
@@ -56,8 +56,8 @@ IncludeVerInfo=1
 AutoIncBuild=0\r
 MajorVer=0\r
 MinorVer=2\r
-Release=6\r
-Build=1\r
+Release=8\r
+Build=0\r
 Debug=0\r
 PreRelease=0\r
 Special=0\r
@@ -68,7 +68,7 @@ CodePage=1252
 [Version Info Keys]\r
 CompanyName=GPSBabel Makers\r
 FileDescription=GPSBabel Windows Frontend\r
-FileVersion=0.2.6.1\r
+FileVersion=0.2.8.0\r
 InternalName=\r
 LegalCopyright=(C) 2005,2006 Olaf Klein (o.b.klein@gpsbabel.org)\r
 LegalTrademarks=\r

diff --git a/win32/gui-2/Makefile b/win32/gui-2/Makefile
index 0d84bc991e73c7779b762253bf1781871981e4d2..3322d791d9e4420893a049f628c4b3e79a6feaa2 100644 (file)
--- a/win32/gui-2/Makefile
+++ b/win32/gui-2/Makefile
@@ -21,7 +21,10 @@ LANG = \
   locale\es\LC_MESSAGES\gpsbabel.mo \\r
   locale\fr\LC_MESSAGES\delphi.mo \\r
   locale\fr\LC_MESSAGES\default.mo \\r
-  locale\fr\LC_MESSAGES\gpsbabel.mo\r
+  locale\fr\LC_MESSAGES\gpsbabel.mo \\r
+  locale\hu\LC_MESSAGES\delphi.mo \\r
+  locale\hu\LC_MESSAGES\default.mo \\r
+  locale\hu\LC_MESSAGES\gpsbabel.mo\r
 \r
 .suffixes: .po\r
 \r
@@ -57,4 +60,5 @@ clean:
        rm -f locale\de\LC_MESSAGES\*.mo\r
        rm -f locale\es\LC_MESSAGES\*.mo\r
        rm -f locale\fr\LC_MESSAGES\*.mo\r
+       rm -f locale\hu\LC_MESSAGES\*.mo\r
 \r

diff --git a/win32/gui-2/about.dfm b/win32/gui-2/about.dfm
index 3437553e2abe7e2e824e2abec44decce73ae2e8a..d4dab20eea907246c481cf10cc1367af63c70004 100644 (file)
Binary files a/win32/gui-2/about.dfm and b/win32/gui-2/about.dfm differ

diff --git a/win32/gui-2/about.pas b/win32/gui-2/about.pas
index 92efefd44b1ee3ff90d80e1d14a4676833306172..68aa609737e298a4e911411ed0197ba8b41611b5 100644 (file)
--- a/win32/gui-2/about.pas
+++ b/win32/gui-2/about.pas
@@ -87,6 +87,7 @@ begin
   lbxTranslators.Items.Add(_('German') + ' ' +  _('by') + ' Olaf Klein');\r
   lbxTranslators.Items.Add(_('French') + ' ' +  _('by') + ' Lilian Morinon');\r
   lbxTranslators.Items.Add(_('Spanish') + ' ' + _('by') + ' Daniel Diaz');\r
+  lbxTranslators.Items.Add(_('Hungarian') + ' ' + _('by') + ' Sprok Bence');\r
 end;\r
 \r
 procedure TfrmAbout.lbURLMouseMove(Sender: TObject; Shift: TShiftState; X,\r

diff --git a/win32/gui-2/common.pas b/win32/gui-2/common.pas
index a2f23fa7d6d6f73025df509bf840e8e1114795c8..6fddbb42f1a936b8539e582d5337adbef88f450f 100644 (file)
--- a/win32/gui-2/common.pas
+++ b/win32/gui-2/common.pas
@@ -103,6 +103,7 @@ type
     format: string;\r
     name:   string;\r
     hint:   string;\r
+    defname: string;\r
     otype:  Byte;\r
     def:    PChar;       // default value from gpsbabel or ini-file\r
     gbdef:  PChar;       // default value from gpsbabel       \r
@@ -110,6 +111,7 @@ type
     max:    PChar;\r
     chb:    TCheckBox;\r
     edit:   TControl;\r
+    dir:    Byte;        // 1 = only in; 2 = only out\r
   end;\r
   POption = ^TOption;\r
 \r
@@ -227,7 +229,7 @@ var
   buff: array[0..1023] of Char;\r
   cin, cend: PChar;\r
   index: Integer;\r
-  opt: POption;\r
+  opt, opt2: POption;\r
   list: TStringList;\r
   i: Integer;\r
   s: string;\r
@@ -289,6 +291,9 @@ begin
     opt.def := opt.gbdef;\r
   end;\r
 \r
+  opt.dir := 3;  // in and out\r
+  opt.defname := opt.name;\r
+\r
   index := Self.IndexOf(opt.format);\r
   if (index >= 0) then\r
     list := TStringList(Self.Objects[index])\r
@@ -298,6 +303,18 @@ begin
     Self.AddObject(opt.format, list);\r
   end;\r
   list.AddObject(opt.name, Pointer(opt));\r
+  if (opt.format = 'xcsv') then\r
+  begin\r
+    if (opt.name = 'style') then\r
+    begin\r
+      opt.dir := 1;\r
+      New(opt2);\r
+      opt2^ := opt^;\r
+      opt2.name := 'style_out';\r
+      opt2.dir := 2;\r
+      list.AddObject(opt2.name, Pointer(opt2));\r
+    end;\r
+  end;\r
 end;\r
 \r
 procedure TOptions.DebugGetHints(List: TStringList);\r
@@ -410,7 +427,7 @@ begin
          info.Ext := ext;\r
          info.internal := internal;\r
          info.Capas := caps;\r
-         \r
+\r
          i := SELF.Add(name);\r
          SELF.PutObject(i, Pointer(info));\r
 \r
@@ -418,7 +435,9 @@ begin
          begin\r
            gpsbabel_knows_inifile := True;\r
            // add -p "" to command-line\r
-         end;\r
+         end\r
+         else if (name = 'xcsv') then\r
+           info.internal := 'file';\r
          break;\r
        end;\r
     end;\r

diff --git a/win32/gui-2/default.po b/win32/gui-2/default.po
index 1151194a9b6abf158fc992e333391da0bb019b9c..d3759d6d89a715b2ea81b5ba68eaab05f2402ab9 100644 (file)
--- a/win32/gui-2/default.po
+++ b/win32/gui-2/default.po
@@ -7,8 +7,8 @@
 msgid ""\r
 msgstr ""\r
 "Project-Id-Version: PACKAGE VERSION\n"\r
-"POT-Creation-Date: 2005-12-06 17:57\n"\r
-"PO-Revision-Date: 2005-12-06 17:57\n"\r
+"POT-Creation-Date: 2007-05-01 19:36\n"\r
+"PO-Revision-Date: 2007-05-01 19:36\n"\r
 "Last-Translator: Somebody <your.email@address.com>\n"\r
 "MIME-Version: 1.0\n"\r
 "Content-Type: text/plain; charset=UTF-8\n"\r
@@ -44,7 +44,7 @@ msgstr ""
 \r
 #. frmAbout..pnClient..pnCenter..lbCopyRight..Caption\r
 #: about.dfm:114\r
-msgid "Copyright (C) 2005 Olaf Klein (o.b.klein@gpsbabel.org)"\r
+msgid "Copyright (C) 2005,2006 Olaf Klein (o.b.klein@gpsbabel.org)"\r
 msgstr ""\r
 \r
 #. frmAbout..pnClient..pnCenter..lbMoreInfo..Caption\r
@@ -54,7 +54,7 @@ msgstr ""
 \r
 #. frmAbout..pnClient..pnCenter..stDescription..Caption\r
 #: about.dfm:149\r
-msgid "The frontend for gpsbabel command line "\r
+msgid "The frontend for GPSBabel command line "\r
 "program"\r
 msgstr ""\r
 \r
@@ -77,12 +77,16 @@ msgstr ""
 #. frmFilter..gbTracks..Caption\r
 #: filter.dfm:31\r
 #. frmMain..pnBottom..cbTracks..Caption\r
-#: main.dfm:589\r
+#: main.dfm:581\r
 msgid "&Tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbTracks..lbTimePlusMinus..Caption\r
 #: filter.dfm:39\r
+#: about.pas:87\r
+#: about.pas:88\r
+#: about.pas:89\r
+#: about.pas:90\r
 msgid "by"\r
 msgstr ""\r
 \r
@@ -183,154 +187,220 @@ msgstr ""
 msgid "TZ"\r
 msgstr ""\r
 \r
+#. frmFilter..gbTracks..cbGPSfix..Hint\r
+#: filter.dfm:306\r
+msgid "Synthesize GPS fixes (PPS, DGPS, 3D, "\r
+"2D)"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cbGPSfix..Caption\r
+#: filter.dfm:307\r
+msgid "GPS fixes"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cbTrackCourse..Hint\r
+#: filter.dfm:316\r
+msgid "Synthesize course values"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cbTrackCourse..Caption\r
+#: filter.dfm:317\r
+msgid "Course"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cbTrackSpeed..Hint\r
+#: filter.dfm:325\r
+msgid "Synthesize speed values"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cbTrackSpeed..Caption\r
+#: filter.dfm:326\r
+msgid "Speed"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cobGPSfixes....Items.Strings\r
+#: filter.dfm:338\r
+msgid "none"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cobGPSfixes....Items.Strings\r
+#: filter.dfm:339\r
+msgid "pps"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTracks..cobGPSfixes....Items.Strings\r
+#: filter.dfm:340\r
+msgid "dgps"\r
+msgstr ""\r
+\r
 #. frmFilter..gbRoutes..Caption\r
-#: filter.dfm:308\r
+#: filter.dfm:352\r
 msgid "&Routes && Tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption\r
-#: filter.dfm:316\r
+#: filter.dfm:360\r
 msgid "limit to"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption\r
-#: filter.dfm:324\r
+#: filter.dfm:368\r
 msgid "Points"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint\r
-#: filter.dfm:331\r
+#: filter.dfm:375\r
 msgid "Simplify routes and tracks by limited number of "\r
 "points"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption\r
-#: filter.dfm:332\r
+#: filter.dfm:376\r
 msgid "Simplify"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint\r
-#: filter.dfm:341\r
+#: filter.dfm:385\r
 msgid "Upper limit of points for routes and "\r
 "tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbReverse..Hint\r
-#: filter.dfm:363\r
+#: filter.dfm:407\r
 msgid "Reverse routes and tracks"\r
 msgstr ""\r
 \r
 #. frmFilter..gbRoutes..cbReverse..Caption\r
-#: filter.dfm:364\r
+#: filter.dfm:408\r
 msgid "Reverse"\r
 msgstr ""\r
 \r
 #. frmFilter..pnBottom..btnOK..Caption\r
-#: filter.dfm:381\r
+#: filter.dfm:425\r
 msgid "OK"\r
 msgstr ""\r
 \r
 #. frmFilter..pnBottom..BitBtn1..Caption\r
-#: filter.dfm:417\r
+#: filter.dfm:461\r
 msgid "File based filters"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..Caption\r
-#: filter.dfm:437\r
+#: filter.dfm:490\r
 #. frmMain..pnBottom..cbWaypoints..Caption\r
-#: main.dfm:563\r
+#: main.dfm:555\r
 msgid "&Waypoints"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..lbWayptRadiusLat..Caption\r
-#: filter.dfm:446\r
+#: filter.dfm:499\r
 msgid "Latitude"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..lbWayptRadiusLon..Caption\r
-#: filter.dfm:454\r
+#: filter.dfm:507\r
 msgid "Longitude"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint\r
-#: filter.dfm:462\r
+#: filter.dfm:515\r
 msgid "Merge waypoints with duplicate locations"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption\r
-#: filter.dfm:463\r
+#: filter.dfm:516\r
 msgid "locations"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint\r
-#: filter.dfm:472\r
+#: filter.dfm:525\r
 msgid "Merge waypoints with duplicate \"short "\r
 "name\""\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption\r
-#: filter.dfm:473\r
+#: filter.dfm:526\r
 msgid "\"short names\""\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint\r
-#: filter.dfm:482\r
+#: filter.dfm:535\r
 msgid "Merge waypoints separated by less then"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption\r
-#: filter.dfm:483\r
+#: filter.dfm:536\r
 msgid "Position"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptSort..Hint\r
-#: filter.dfm:511\r
+#: filter.dfm:564\r
 msgid "Sort waypoints by \"short name\" or by "\r
 "description"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptSort..Caption\r
-#: filter.dfm:512\r
+#: filter.dfm:565\r
 msgid "Sort"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint\r
-#: filter.dfm:520\r
+#: filter.dfm:573\r
 msgid "Merge duplicate waypoints"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption\r
-#: filter.dfm:521\r
+#: filter.dfm:574\r
 msgid "Duplicates"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptRadius..Hint\r
-#: filter.dfm:530\r
+#: filter.dfm:583\r
 msgid "Include points based on their proximity to central "\r
 "point"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..cbWayptRadius..Caption\r
-#: filter.dfm:531\r
+#: filter.dfm:584\r
 msgid "Radius"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..edWayptRadiusLat..Hint\r
-#: filter.dfm:559\r
+#: filter.dfm:612\r
 msgid "Latitude of central point"\r
 msgstr ""\r
 \r
 #. frmFilter..gbWaypoints..edWayptRadiusLon..Hint\r
-#: filter.dfm:569\r
+#: filter.dfm:622\r
 msgid "Longitude of central point"\r
 msgstr ""\r
 \r
+#. frmFilter..gbTransform..Caption\r
+#: filter.dfm:634\r
+msgid "Transformation"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTransform..cbTransform..Caption\r
+#: filter.dfm:651\r
+msgid "Transform"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTransform..cbTransformDelete..Hint\r
+#: filter.dfm:660\r
+msgid "Delete source data after transformation"\r
+msgstr ""\r
+\r
+#. frmFilter..gbTransform..cbTransformDelete..Caption\r
+#: filter.dfm:661\r
+msgid "Delete"\r
+msgstr ""\r
+\r
 #. frmMain..pnTop..gbInput..Caption\r
 #: main.dfm:38\r
-#: main.pas:269\r
-#: main.pas:274\r
-#: main.pas:460\r
-#: main.pas:842\r
+#: main.pas:270\r
+#: main.pas:275\r
+#: main.pas:467\r
+#: main.pas:868\r
 msgid "Input"\r
 msgstr ""\r
 \r
@@ -342,39 +412,39 @@ msgstr ""
 #. frmMain..pnTop..gbInput..lbInputOpts..Caption\r
 #: main.dfm:68\r
 #. frmMain..pnTop..gbOutput..lbOutputOpts..Caption\r
-#: main.dfm:233\r
+#: main.dfm:229\r
 #. frmMain..ActionList1..acOptionsSourceFormat..Category\r
-#: main.dfm:1428\r
+#: main.dfm:1418\r
 #. frmMain..ActionList1..acOptionsTargetFormat..Category\r
-#: main.dfm:1433\r
+#: main.dfm:1423\r
 #. frmMain..ActionList1..acOptionsEnableCharactersetTransformation..Category\r
-#: main.dfm:1447\r
+#: main.dfm:1437\r
 msgid "Options"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbInput..lbInputFormat..Caption\r
 #: main.dfm:76\r
 #. frmMain..pnTop..gbOutput..lbOutputFormat..Caption\r
-#: main.dfm:263\r
+#: main.dfm:259\r
 msgid "Format"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbInput..lbInputFile..Caption\r
 #: main.dfm:83\r
 #. frmMain..pnTop..gbOutput..lbOutputFile..Caption\r
-#: main.dfm:270\r
+#: main.dfm:266\r
 #. frmMain..ActionList1..acFileExit..Category\r
-#: main.dfm:1409\r
+#: main.dfm:1399\r
 #. frmMain..ActionList1..acFileClearMemo..Category\r
-#: main.dfm:1438\r
+#: main.dfm:1428\r
 #. frmMain..ActionList1..acFileOutputToScreen..Category\r
-#: main.dfm:1453\r
+#: main.dfm:1443\r
 #. frmMain..ActionList1..acFileChangeLanguage..Category\r
-#: main.dfm:1465\r
+#: main.dfm:1455\r
 #. frmMain..ActionList1..acFileExportCSV..Category\r
-#: main.dfm:1470\r
-#: main.pas:839\r
-#: main.pas:893\r
+#: main.dfm:1460\r
+#: main.pas:865\r
+#: main.pas:919\r
 msgid "File"\r
 msgstr ""\r
 \r
@@ -386,7 +456,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..chbInputDevice..Caption\r
 #: main.dfm:115\r
 #. frmMain..pnTop..gbOutput..chbOutputDevice..Caption\r
-#: main.dfm:303\r
+#: main.dfm:299\r
 msgid "Device"\r
 msgstr ""\r
 \r
@@ -408,7 +478,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:152\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:367\r
+#: main.dfm:363\r
 msgid "- default -"\r
 msgstr ""\r
 \r
@@ -418,236 +488,236 @@ msgid "Read data from device ..."
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbInput..cbInputFormatDevice..Hint\r
-#: main.dfm:198\r
+#: main.dfm:194\r
 msgid "Format for input from device"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbInput..cbInputFormat..Hint\r
-#: main.dfm:212\r
+#: main.dfm:208\r
 msgid "Format for input from file"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..Caption\r
-#: main.dfm:226\r
-#: main.pas:270\r
-#: main.pas:275\r
-#: main.pas:469\r
-#: main.pas:896\r
+#: main.dfm:222\r
+#: main.pas:271\r
+#: main.pas:276\r
+#: main.pas:476\r
+#: main.pas:922\r
 msgid "Output"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..sbSaveFile..Hint\r
-#: main.dfm:277\r
+#: main.dfm:273\r
 msgid "Start the file save dialog"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..chbOutputDevice..Hint\r
-#: main.dfm:300\r
+#: main.dfm:296\r
 msgid "Write data to device instead to file"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..cbOutputFormatDevice..Hint\r
-#: main.dfm:313\r
+#: main.dfm:309\r
 msgid "Format for ouput to device"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..edOutputOpts..Hint\r
-#: main.dfm:325\r
+#: main.dfm:321\r
 msgid "Options for the selected output format"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..cbOutputFormat..Hint\r
-#: main.dfm:336\r
+#: main.dfm:332\r
 msgid "Format for output to file"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..edOutputFile..Hint\r
-#: main.dfm:349\r
+#: main.dfm:345\r
 msgid "Write data to given filename"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..cbOutputLang..Hint\r
-#: main.dfm:361\r
+#: main.dfm:357\r
 msgid "Characterset for output data"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbOutput..cbOutputDevice..Hint\r
-#: main.dfm:394\r
+#: main.dfm:390\r
 msgid "Write data to device ..."\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..lbWhat..Caption\r
-#: main.dfm:423\r
+#: main.dfm:415\r
 msgid "What ?"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..cbWaypoints..Hint\r
-#: main.dfm:562\r
+#: main.dfm:554\r
 msgid "Process waypoint information"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..cbRoutes..Hint\r
-#: main.dfm:576\r
+#: main.dfm:568\r
 msgid "Process route information"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..cbRoutes..Caption\r
-#: main.dfm:577\r
+#: main.dfm:569\r
 msgid "&Routes"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..cbTracks..Hint\r
-#: main.dfm:588\r
+#: main.dfm:580\r
 msgid "Process track information"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..btnFilter..Caption\r
-#: main.dfm:602\r
+#: main.dfm:594\r
 #. frmMain..ActionList1..acFilterSelect..Caption\r
-#: main.dfm:1403\r
+#: main.dfm:1393\r
 msgid "&Filter"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..btnProcess..Hint\r
-#: main.dfm:646\r
+#: main.dfm:638\r
 msgid "Start data conversion"\r
 msgstr ""\r
 \r
 #. frmMain..pnBottom..btnProcess..Caption\r
-#: main.dfm:649\r
+#: main.dfm:641\r
 #. frmMain..ActionList1..acConvert..Caption\r
-#: main.dfm:1396\r
+#: main.dfm:1386\r
 msgid "let's go"\r
 msgstr ""\r
 \r
 #. frmMain..OpenDialog..Filter\r
-#: main.dfm:711\r
+#: main.dfm:701\r
 msgid "Garmin Mapsource mps|*.mps|All files|*.*"\r
 msgstr ""\r
 \r
 #. frmMain..SaveDialog..Filter\r
-#: main.dfm:717\r
+#: main.dfm:707\r
 msgid "All file(s)|*.*|Garmin MapSource mps|*.mps"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acConvert..Category\r
-#: main.dfm:1395\r
+#: main.dfm:1385\r
 #. frmMain..ActionList1..acFilterSelect..Category\r
-#: main.dfm:1402\r
+#: main.dfm:1392\r
 msgid "Babel"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFilterSelect..Hint\r
-#: main.dfm:1404\r
+#: main.dfm:1394\r
 msgid "Filter incomming data before writing them to file or "\r
 "device"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileExit..Caption\r
-#: main.dfm:1410\r
+#: main.dfm:1400\r
 msgid "E&xit"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpAbout..Category\r
-#: main.dfm:1414\r
+#: main.dfm:1404\r
 #. frmMain..ActionList1..acHelpIntro..Category\r
-#: main.dfm:1419\r
+#: main.dfm:1409\r
 #. frmMain..ActionList1..acHelpReadme..Category\r
-#: main.dfm:1423\r
+#: main.dfm:1413\r
 msgid "Help"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpAbout..Caption\r
-#: main.dfm:1415\r
+#: main.dfm:1405\r
 msgid "&About"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpIntro..Caption\r
-#: main.dfm:1420\r
+#: main.dfm:1410\r
 msgid "&Intro"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acHelpReadme..Caption\r
-#: main.dfm:1424\r
+#: main.dfm:1414\r
 #. frmReadme..Caption\r
 #: readme.dfm:6\r
 msgid "GPSBabel README"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acOptionsSourceFormat..Caption\r
-#: main.dfm:1429\r
+#: main.dfm:1419\r
 msgid "... for source format"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acOptionsTargetFormat..Caption\r
-#: main.dfm:1434\r
+#: main.dfm:1424\r
 msgid "... for target format"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileClearMemo..Caption\r
-#: main.dfm:1439\r
+#: main.dfm:1429\r
 msgid "Clear output"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileClearMemo..Hint\r
-#: main.dfm:1440\r
+#: main.dfm:1430\r
 msgid "Clear messages"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acOptionsEnableCharactersetTransformation..Caption\r
-#: main.dfm:1448\r
+#: main.dfm:1438\r
 msgid "Enable characterset transformation"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileOutputToScreen..Caption\r
-#: main.dfm:1454\r
+#: main.dfm:1444\r
 msgid "Output to screen"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileChangeLanguage..Caption\r
-#: main.dfm:1466\r
+#: main.dfm:1456\r
 msgid "Change language"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acFileExportCSV..Caption\r
-#: main.dfm:1471\r
+#: main.dfm:1461\r
 msgid "Export gpsbabel.csv (unicode)"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuFile..Caption\r
-#: main.dfm:1479\r
+#: main.dfm:1469\r
 msgid "&File"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuFile..File1..Caption\r
-#: main.dfm:1487\r
+#: main.dfm:1477\r
 msgid "Export"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuOptions..Caption\r
-#: main.dfm:1508\r
+#: main.dfm:1498\r
 msgid "&Options"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption\r
-#: main.dfm:1510\r
+#: main.dfm:1500\r
 msgid "Synthesize shortnames"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint\r
-#: main.dfm:1513\r
+#: main.dfm:1503\r
 msgid "Ignore shortnames from source data and synthesize them from "\r
 "description or notes"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuOptions..mnuOptionsForceDataType..Caption\r
-#: main.dfm:1517\r
+#: main.dfm:1507\r
 msgid "Force selected GPS data types (nuketypes "\r
 "filter)"\r
 msgstr ""\r
 \r
 #. frmMain..MainMenu1..mnuHelp..Caption\r
-#: main.dfm:1558\r
+#: main.dfm:1548\r
 msgid "&Help"\r
 msgstr ""\r
 \r
@@ -662,172 +732,210 @@ msgid "Abort"
 msgstr ""\r
 \r
 #: about.pas:87\r
-msgid "German by Olaf Klein"\r
+#: select.pas:81\r
+msgid "German"\r
 msgstr ""\r
 \r
 #: about.pas:88\r
-msgid "French by Lilian Morinon"\r
+#: select.pas:83\r
+msgid "French"\r
+msgstr ""\r
+\r
+#: about.pas:89\r
+#: select.pas:82\r
+msgid "Spanish"\r
+msgstr ""\r
+\r
+#: about.pas:90\r
+#: select.pas:85\r
+msgid "Hungarian"\r
 msgstr ""\r
 \r
-#: about.pas:131\r
+#: about.pas:132\r
 msgid "Please have a look at the file README.GUI.\n"\r
 "\nThere you will find all information you need to\n"\r
 "get GPSBabelGUI working in your own "\r
 "language."\r
 msgstr ""\r
 \r
-#: filter.pas:199\r
+#: filter.pas:180\r
+#: filter.pas:181\r
+#: filter.pas:184\r
+#: filter.pas:185\r
+msgid "Waypoints"\r
+msgstr ""\r
+\r
+#: filter.pas:180\r
+#: filter.pas:181\r
+#: filter.pas:182\r
+#: filter.pas:183\r
+msgid "Routes"\r
+msgstr ""\r
+\r
+#: filter.pas:182\r
+#: filter.pas:183\r
+#: filter.pas:184\r
+#: filter.pas:185\r
+msgid "Tracks"\r
+msgstr ""\r
+\r
+#: filter.pas:224\r
 msgid "Feet"\r
 msgstr ""\r
 \r
-#: filter.pas:200\r
+#: filter.pas:225\r
 msgid "Meter"\r
 msgstr ""\r
 \r
-#: filter.pas:203\r
+#: filter.pas:228\r
 msgid "Miles"\r
 msgstr ""\r
 \r
-#: filter.pas:204\r
+#: filter.pas:229\r
 msgid "Kilometer"\r
 msgstr ""\r
 \r
-#: filter.pas:214\r
+#: filter.pas:239\r
 msgid "Not supported by gpsbabel.exe, release "\r
 "%s!"\r
 msgstr ""\r
 \r
-#: filter.pas:250\r
+#: filter.pas:288\r
 msgid "Value (%s) out of range (%g to %g)!"\r
 msgstr ""\r
 \r
-#: filter.pas:530\r
-#: options.pas:654\r
+#: filter.pas:593\r
+#: options.pas:661\r
 msgid "Discard changes?"\r
 msgstr ""\r
 \r
-#: main.pas:243\r
+#: main.pas:244\r
 msgid "Internal development release"\r
 msgstr ""\r
 \r
-#: main.pas:245\r
+#: main.pas:246\r
 msgid "BETA"\r
 msgstr ""\r
 \r
-#: main.pas:247\r
+#: main.pas:248\r
 msgid "Private release"\r
 msgstr ""\r
 \r
-#: main.pas:249\r
+#: main.pas:250\r
 msgid "Special release"\r
 msgstr ""\r
 \r
-#: main.pas:340\r
+#: main.pas:342\r
 msgid "The file \"gpsbabel.exe\" found in current directory is too "\r
 "old!"\r
 msgstr ""\r
 \r
-#: main.pas:409\r
-#: main.pas:543\r
+#: main.pas:416\r
+#: main.pas:550\r
 msgid "All files|*.*"\r
 msgstr ""\r
 \r
-#: main.pas:477\r
+#: main.pas:484\r
 msgid "Select and edit options for \"%s\""\r
 msgstr ""\r
 \r
-#: main.pas:481\r
+#: main.pas:488\r
 msgid "No options available for \"%s\""\r
 msgstr ""\r
 \r
-#: main.pas:590\r
+#. s := s + '-1';\r
+#: main.pas:603\r
 msgid "File %s not found."\r
 msgstr ""\r
 \r
-#: main.pas:648\r
+#: main.pas:664\r
 msgid "File \"%s\" exists ! Overwrite ?"\r
 msgstr ""\r
 \r
-#: main.pas:649\r
+#: main.pas:665\r
 msgid "Warning"\r
 msgstr ""\r
 \r
-#: main.pas:682\r
+#: main.pas:698\r
 msgid "Could not run \"gpsbabel.exe\"!"\r
 msgstr ""\r
 \r
-#: main.pas:691\r
+#: main.pas:707\r
 msgid "Sorry, gpsbabel.exe reported problems!"\r
 msgstr ""\r
 \r
-#: main.pas:693\r
+#: main.pas:709\r
 msgid "Converted successfully from \"%s\" to "\r
 "\"%s\"."\r
 msgstr ""\r
 \r
-#: main.pas:794\r
+#: main.pas:820\r
 msgid "GPSBabel, version %s"\r
 msgstr ""\r
 \r
-#: main.pas:828\r
-#: main.pas:883\r
+#: main.pas:854\r
+#: main.pas:909\r
 msgid "Port"\r
 msgstr ""\r
 \r
-#: main.pas:980\r
+#: main.pas:1013\r
 msgid "Options for \"%s\""\r
 msgstr ""\r
 \r
-#: main.pas:1169\r
-#: main.pas:1239\r
+#: main.pas:1203\r
+#: main.pas:1273\r
 msgid "Choose language"\r
 msgstr ""\r
 \r
-#: main.pas:1169\r
+#: main.pas:1203\r
 msgid "for GUIBabelGUI"\r
 msgstr ""\r
 \r
-#: main.pas:1239\r
+#: main.pas:1273\r
 msgid "for export"\r
 msgstr ""\r
 \r
 #. override;\r
-#: options.pas:143\r
+#: options.pas:147\r
 msgid "Be aware, that most options are made for the output side. "\r
 msgstr ""\r
 \r
-#: options.pas:144\r
+#: options.pas:148\r
 msgid "Currently we don't have a flag which tells us which direction is used "\r
 "by the options."\r
 msgstr ""\r
 \r
-#: options.pas:204\r
+#: options.pas:208\r
 msgid "Short \"%s\""\r
 msgstr ""\r
 \r
-#: options.pas:325\r
+#: options.pas:332\r
 msgid "Invalid line format!"\r
 msgstr ""\r
 \r
-#: options.pas:346\r
+#: options.pas:353\r
 msgid "Unknown option \"%s\"!"\r
 msgstr ""\r
 \r
-#: utils.pas:113\r
+#: select.pas:84\r
+msgid "English"\r
+msgstr ""\r
+\r
+#: utils.pas:119\r
 msgid "Error WINAPI: Could not create \"NamedPipe\"!"\r
 msgstr ""\r
 \r
-#: utils.pas:118\r
+#: utils.pas:124\r
 msgid "\"gpsbabel.exe\" not found!!!"\r
 msgstr ""\r
 \r
 #. dwCreationFlags,     // creation flags\r
-#: utils.pas:137\r
+#: utils.pas:143\r
 msgid "Could not run \"gpsbabel.exe\" (Error "\r
 "%d)!"\r
 msgstr ""\r
 \r
-#: utils.pas:165\r
+#: utils.pas:176\r
 msgid "\"gpsbabel.exe\" returned error 0x%x (%d)"\r
 msgstr ""\r
 \r

diff --git a/win32/gui-2/gpsbabel.po b/win32/gui-2/gpsbabel.po
index b462a6cd9ed9a037b1287dc8570f5f3c5d87c24d..74b6fda3aa2951f1cf5cfc5984d9bab25055c55f 100644 (file)
--- a/win32/gui-2/gpsbabel.po
+++ b/win32/gui-2/gpsbabel.po
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Append icon_descr to description"\r
 msgstr ""\r
 \r
+msgid "Append realtime positioning data to the output file instead of truncating"\r
+msgstr ""\r
+\r
 msgid "Base URL for link tag in output"\r
 msgstr ""\r
 \r
@@ -70,6 +73,9 @@ msgstr ""
 msgid "Default icon name"\r
 msgstr ""\r
 \r
+msgid "Default location"\r
+msgstr ""\r
+\r
 msgid "Default speed for waypoints (knots/hr)"\r
 msgstr ""\r
 \r
@@ -133,6 +139,9 @@ msgstr ""
 msgid "Include groundspeak logs if present"\r
 msgstr ""\r
 \r
+msgid "Include major turn points (with description) from calculated route"\r
+msgstr ""\r
+\r
 msgid "Include only via stations in route"\r
 msgstr ""\r
 \r
@@ -355,7 +364,7 @@ msgstr ""
 msgid "Use shortname instead of description"\r
 msgstr ""\r
 \r
-msgid "Version of gdb file to generate (1,2)"\r
+msgid "Version of gdb file to generate (1..3)"\r
 msgstr ""\r
 \r
 msgid "Version of mapsource file to generate (3,4,5)"\r
@@ -376,6 +385,9 @@ msgstr ""
 msgid "Width of lines, in pixels"\r
 msgstr ""\r
 \r
+msgid "Write position using this grid."\r
+msgstr ""\r
+\r
 msgid "Write timestamps with offset x to UTC time"\r
 msgstr ""\r
 \r

diff --git a/win32/gui-2/ignore.po b/win32/gui-2/ignore.po
index bf00e1699947893aa3b9b23c688f0c5f4aeeb6b4..af13bc5d2f6d5f7292a8b25f108cdd32847028c0 100644 (file)
--- a/win32/gui-2/ignore.po
+++ b/win32/gui-2/ignore.po
@@ -1,14 +1,14 @@
 #  Doesn't have any letters\r
 #. frmMain..MainMenu1..mnuFile..N5..Caption\r
-#: main.dfm:1495\r
+#: main.dfm:1485\r
 #. frmMain..MainMenu1..mnuFile..N3..Caption\r
-#: main.dfm:1501\r
+#: main.dfm:1491\r
 #. frmMain..MainMenu1..mnuOptions..N2..Caption\r
-#: main.dfm:1525\r
+#: main.dfm:1515\r
 #. frmMain..MainMenu1..mnuOptions..N4..Caption\r
-#: main.dfm:1537\r
+#: main.dfm:1527\r
 #. frmMain..MainMenu1..mnuHelp..N1..Caption\r
-#: main.dfm:1566\r
+#: main.dfm:1556\r
 msgid "-"\r
 msgstr ""\r
 \r
@@ -18,13 +18,25 @@ msgstr ""
 msgid "+/-"\r
 msgstr ""\r
 \r
+#  Doesn't look like text\r
+#. frmFilter..gbTracks..cobGPSfixes....Items.Strings\r
+#: filter.dfm:342\r
+msgid "2d"\r
+msgstr ""\r
+\r
+#  Doesn't look like text\r
+#. frmFilter..gbTracks..cobGPSfixes....Items.Strings\r
+#: filter.dfm:341\r
+msgid "3d"\r
+msgstr ""\r
+\r
 #  Doesn't have any letters\r
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text\r
 #: filter.dfm:344\r
 msgid "50 "\r
 msgstr ""\r
 \r
-#. frmFilter..gbTracks..edTrackTitle..Text\r
+#. frmFilter..gbTracks..edTrackTitleValue..Text\r
 #: filter.dfm:88\r
 msgid "ACTIVE LOG # %Y%m%d"\r
 msgstr ""\r
@@ -32,7 +44,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:153\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:368\r
+#: main.dfm:364\r
 msgid "ASCII"\r
 msgstr ""\r
 \r
@@ -69,20 +81,20 @@ msgid "COM4"
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acDebugCreatePo..Caption\r
-#: main.dfm:1459\r
+#: main.dfm:1449\r
 msgid "Create options.po"\r
 msgstr ""\r
 \r
 #. frmMain..ActionList1..acDebugCreatePo..Category\r
-#: main.dfm:1458\r
+#: main.dfm:1448\r
 #. frmMain..MainMenu1..mnuDebug..Caption\r
-#: main.dfm:1546\r
+#: main.dfm:1536\r
 msgid "Debug"\r
 msgstr ""\r
 \r
 #  Seems like a Font.Name extract\r
 #. frmMain..memoOutput..Font.Name\r
-#: main.dfm:678\r
+#: main.dfm:670\r
 msgid "Fixedsys"\r
 msgstr ""\r
 \r
@@ -90,7 +102,7 @@ msgstr ""
 #. frmMain..Caption\r
 #: main.dfm:6\r
 #. Programmer's name for it: SGPSBabelTitle\r
-#: common.pas:32\r
+#: common.pas:35\r
 msgid "GPSBabelGUI-2"\r
 msgstr ""\r
 \r
@@ -100,8 +112,10 @@ msgstr ""
 msgid "GPSBabelGUI-2:"\r
 msgstr ""\r
 \r
+#. frmMain..stbMain......Text\r
+#: main.dfm:693\r
 #. Programmer's name for it: SGPSBabelURL\r
-#: common.pas:31\r
+#: common.pas:34\r
 msgid "http://www.gpsbabel.org"\r
 msgstr ""\r
 \r
@@ -114,7 +128,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:156\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:371\r
+#: main.dfm:367\r
 msgid "ISO-8859-1"\r
 msgstr ""\r
 \r
@@ -122,7 +136,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:165\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:380\r
+#: main.dfm:376\r
 msgid "ISO-8859-10"\r
 msgstr ""\r
 \r
@@ -130,7 +144,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:166\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:381\r
+#: main.dfm:377\r
 msgid "ISO-8859-13"\r
 msgstr ""\r
 \r
@@ -138,7 +152,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:167\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:382\r
+#: main.dfm:378\r
 msgid "ISO-8859-14"\r
 msgstr ""\r
 \r
@@ -146,7 +160,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:168\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:383\r
+#: main.dfm:379\r
 msgid "ISO-8859-15"\r
 msgstr ""\r
 \r
@@ -154,7 +168,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:157\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:372\r
+#: main.dfm:368\r
 msgid "ISO-8859-2"\r
 msgstr ""\r
 \r
@@ -162,7 +176,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:158\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:373\r
+#: main.dfm:369\r
 msgid "ISO-8859-3"\r
 msgstr ""\r
 \r
@@ -170,7 +184,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:159\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:374\r
+#: main.dfm:370\r
 msgid "ISO-8859-4"\r
 msgstr ""\r
 \r
@@ -178,7 +192,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:160\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:375\r
+#: main.dfm:371\r
 msgid "ISO-8859-5"\r
 msgstr ""\r
 \r
@@ -186,7 +200,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:161\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:376\r
+#: main.dfm:372\r
 msgid "ISO-8859-6"\r
 msgstr ""\r
 \r
@@ -194,7 +208,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:162\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:377\r
+#: main.dfm:373\r
 msgid "ISO-8859-7"\r
 msgstr ""\r
 \r
@@ -202,7 +216,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:163\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:378\r
+#: main.dfm:374\r
 msgid "ISO-8859-8"\r
 msgstr ""\r
 \r
@@ -210,7 +224,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:164\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:379\r
+#: main.dfm:375\r
 msgid "ISO-8859-9"\r
 msgstr ""\r
 \r
@@ -218,14 +232,14 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:169\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:384\r
+#: main.dfm:380\r
 msgid "KOI-8"\r
 msgstr ""\r
 \r
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:170\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:385\r
+#: main.dfm:381\r
 msgid "MACROMAN"\r
 msgstr ""\r
 \r
@@ -246,15 +260,15 @@ msgstr ""
 #. frmMain..Font.Name\r
 #: main.dfm:13\r
 #. frmMain..pnBottom..lbWhat..Font.Name\r
-#: main.dfm:427\r
+#: main.dfm:419\r
 #. frmMain..stbMain..Font.Name\r
-#: main.dfm:693\r
+#: main.dfm:685\r
 #. frmOptions..Font.Name\r
 #: options.dfm:14\r
 #. frmOptions..pnOptions..Font.Name\r
-#: options.dfm:68\r
+#: options.dfm:69\r
 #. frmOptions..pnOptions..mmWarning..Font.Name\r
-#: options.dfm:85\r
+#: options.dfm:86\r
 #. frmReadme..Font.Name\r
 #: readme.dfm:11\r
 #. frmSelect..Font.Name\r
@@ -267,7 +281,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:154\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:369\r
+#: main.dfm:365\r
 msgid "MS-ANSI"\r
 msgstr ""\r
 \r
@@ -283,7 +297,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputDevice....Items.Strings\r
 #: main.dfm:183\r
 #. frmMain..pnTop..gbOutput..cbOutputDevice....Items.Strings\r
-#: main.dfm:398\r
+#: main.dfm:394\r
 msgid "USB"\r
 msgstr ""\r
 \r
@@ -291,7 +305,7 @@ msgstr ""
 #. frmMain..pnTop..gbInput..cbInputLang....Items.Strings\r
 #: main.dfm:155\r
 #. frmMain..pnTop..gbOutput..cbOutputLang....Items.Strings\r
-#: main.dfm:370\r
+#: main.dfm:366\r
 msgid "UTF-8"\r
 msgstr ""\r
 \r

diff --git a/win32/gui-2/options.pas b/win32/gui-2/options.pas
index 788eb972338cfc47dc9ae6d12fe64b8e1f5a1238..20beb518caeb97f1d1766e4d52fbd77889f11dcd 100644 (file)
--- a/win32/gui-2/options.pas
+++ b/win32/gui-2/options.pas
@@ -170,9 +170,16 @@ begin
   for i := 0 to FOpts.Count - 1 do\r
   begin\r
     o := Pointer(FOpts.Objects[i]);\r
+\r
     o.chb := nil;\r
     o.edit := nil;\r
 \r
+    if (o.dir <> 3) then\r
+    begin\r
+      if (FIsInput and (o.dir and 1 = 0)) then Continue\r
+      else if (not(FIsInput) and (o.dir and 2 = 0)) then Continue;\r
+    end;\r
+\r
     if (FFormat = '') then\r
     begin\r
       FFormat := o.format;\r
@@ -205,9 +212,14 @@ begin
 //  chb.Checked := (gpsbabel_ini.ReadString(o.format, o.name, #1) <> #1);\r
     chb.Parent := pnOptions;\r
 \r
-    chb.Hint := SysUtils.Format(_('Short "%s"'), [o.name]);\r
+    chb.Hint := SysUtils.Format(_('Short "%s"'), [o.defname]);\r
     chb.ShowHint := True;\r
 \r
+    if (o.format = 'xcsv') and (o.defname = 'style') then\r
+    begin\r
+      chb.Checked := True;\r
+    end;\r
+\r
     xy.y := xy.y + chb.Height + 8;\r
     if (o.otype <> 4) then\r
       if (chb.Width > xy.x) then xy.x := chb.Width;\r
@@ -237,8 +249,7 @@ begin
       1: CreateIntegerOption(xy.X, xy.Y - 2, i + 1, o, xmax);\r
       2, 3: CreateStringOption(xy.X, xy.Y - 2, i + 1, o, xmax);\r
       4: ;\r
-      5: // ??? if FIsInput then\r
-        CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax);\r
+      5: CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax);\r
       6: if not FIsInput then CreateFileOption(xy.X, xy.Y - 2, i + 1, o, False, xmax);\r
     end;\r
     if (o.edit <> nil) then\r
@@ -294,10 +305,10 @@ begin
       if (o.chb.State = cbGrayed) then Continue\r
     end\r
     else if not(o.chb.Checked) then Continue;\r
-    \r
+\r
     if (Result <> '') then\r
       Result := Result + ',';\r
-    Result := Result + o.name;\r
+    Result := Result + o.defname;\r
 \r
     if (o.edit = nil) then\r
     begin\r
@@ -317,8 +328,8 @@ end;
 procedure TfrmOptions.SetOptsStr(const AValue: string);\r
 var\r
   l: TStrings;\r
-  i, j: Integer;\r
-  s, name, value: string;\r
+  i, j, k: Integer;\r
+  s, name, value, name_out: string;\r
   o: POption;\r
   ud: TUpDown;\r
 begin\r
@@ -350,7 +361,17 @@ begin
 \r
       j := FOpts.IndexOf(name);\r
       if (j < 0) then\r
-        raise eUnknownOption.CreateFmt(_('Unknown option "%s"!'), [name]);\r
+        raise eUnknownOption.CreateFmt(_('Unknown option "%s"!'), [name])\r
+      else if not(FIsInput) then\r
+      begin\r
+        name_out := name + '_out';\r
+        k := FOpts.IndexOf(name);\r
+        if (k >= 0) then\r
+        begin\r
+          name := name_out;\r
+          j := k;\r
+        end;\r
+      end;\r
 \r
       o := Pointer(FOpts.Objects[j]);\r
       if (o.edit <> nil) then\r
@@ -472,7 +493,8 @@ begin
   WinOpenURL(readme_html_path + '#fmt_' + FFormat);\r
 end;\r
 \r
-procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer; o: POption; IsInput: Boolean; xmax: Integer = -1);\r
+procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer;\r
+  o: POption; IsInput: Boolean; xmax: Integer = -1);\r
 var\r
   ed: TEdit;\r
   btn: TSpeedButton;\r
@@ -566,7 +588,9 @@ var
   ins: Boolean;\r
 begin\r
   List.Clear;\r
-  s := Trim(line) + ',';\r
+  s := Trim(line);\r
+  while ((s <> '') and (s[Length(s)] = ',')) do SetLength(s, Length(s) - 1);\r
+  s := s + ',';\r
 \r
   cin := PChar(s);\r
   cend := cin + StrLen(cin);\r

diff --git a/win32/gui-2/select.pas b/win32/gui-2/select.pas
index 43e166f72d480b0417f536230ee85f4c9d8a7b02..d1dddea029d05a66b4ede63744adc6e04dba11de 100644 (file)
--- a/win32/gui-2/select.pas
+++ b/win32/gui-2/select.pas
@@ -62,7 +62,7 @@ function SelectLanguage(const Title: string; const Builtin: TStrings; var Lang:
 var\r
   i: Integer;\r
   s, sx, sy: string;\r
-  l: TStrings;\r
+  l: TStringList;\r
 \r
 begin\r
   Result := False;\r
@@ -72,6 +72,8 @@ begin
 \r
   l := TStringList.Create;\r
   try\r
+    l.Sorted := True;\r
+    \r
     sy := '';\r
     for i := 0 to Builtin.Count - 1 do\r
     begin\r
@@ -82,6 +84,7 @@ begin
       if (CompareText(s, 'es') = 0) then sx := _('Spanish') else\r
       if (CompareText(s, 'fr') = 0) then sx := _('French') else\r
       if (CompareText(s, 'en') = 0) then sx := _('English') else\r
+      if (CompareText(s, 'hu') = 0) then sx := _('Hungarian') else\r
         sx := '???';\r
 \r
       sx := Format('%s - %s', [s, sx]);\r